From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 10 Jun 1993 20:44:12 +0000 (+0000)
Subject: (abbreviate-file-name): Make abbreviated-home-dir
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95436
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e98dda89869c4aee4291c9976cac54af56ffd835;p=emacs.git

(abbreviate-file-name): Make abbreviated-home-dir
from `~/', not from just `~'.
---

diff --git a/lisp/files.el b/lisp/files.el
index b7cbb96db2b..37ad1c980bc 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -509,10 +509,12 @@ Type \\[describe-variable] directory-abbrev-alist RET for more information."
     ;; Compute and save the abbreviated homedir name.
     ;; We defer computing this until the first time it's needed, to
     ;; give time for directory-abbrev-alist to be set properly.
+    ;; We include a slash at the end, to avoid spurious matches
+    ;; such as `/usr/foobar' when the home dir is `/usr/foo'.
     (or abbreviated-home-dir
 	(setq abbreviated-home-dir
 	      (let ((abbreviated-home-dir "$foo"))
-		(concat "^" (abbreviate-file-name (expand-file-name "~"))))))
+		(concat "^" (abbreviate-file-name (expand-file-name "~/"))))))
     ;; If FILENAME starts with the abbreviated homedir,
     ;; make it start with `~' instead.
     (if (string-match abbreviated-home-dir filename)